diff --git a/src/data.cpp b/src/data.cpp
index bfea0a0..961aeb7 100644
--- a/src/data.cpp
+++ b/src/data.cpp
@@ -1194,7 +1194,7 @@ FieldStorage::~FieldStorage()
 
 size_t FieldStorage::index() const
 {
-    const size_t ret = this-top->members.data();
+    const size_t ret = this - top->members.data();
     return ret;
 }
 
diff --git a/src/evhelper.cpp b/src/evhelper.cpp
index becb9d2..329c536 100644
--- a/src/evhelper.cpp
+++ b/src/evhelper.cpp
@@ -593,7 +593,7 @@ bool EvOutBuf::refill(size_t more)
 
     evbuffer_iovec vec;
     vec.iov_base = base;
-    vec.iov_len  = pos-base;
+    vec.iov_len  = base ? pos - base : 0u;
 
     if(base && evbuffer_commit_space(backing, &vec, 1))
         throw std::bad_alloc(); // leak?