diff --git a/include/libcouchbase/couchbase.h b/include/libcouchbase/couchbase.h
index 09dd66720..605500fd8 100644
--- a/include/libcouchbase/couchbase.h
+++ b/include/libcouchbase/couchbase.h
@@ -487,6 +487,7 @@ extern "C" {
      *                       from this command
      * @return Status of the operation.
      */
+    LIBCOUCHBASE_API
     libcouchbase_error_t libcouchbase_flush(libcouchbase_t instance,
                                             const void* cookie);
 
diff --git a/src/instance.c b/src/instance.c
index 09c0a1167..1242faada 100644
--- a/src/instance.c
+++ b/src/instance.c
@@ -281,9 +281,9 @@ static void libcouchbase_update_serverlist(libcouchbase_t instance)
  */
 static bool parse_chunk(libcouchbase_t instance)
 {
-    assert (instance->vbucket_stream.chunk_size != 0);
-
     buffer_t *buffer = &instance->vbucket_stream.chunk;
+    assert(instance->vbucket_stream.chunk_size != 0);
+
     if (instance->vbucket_stream.chunk_size == (size_t)-1) {
         char *ptr = strstr(buffer->data, "\r\n");
         long val;
diff --git a/src/ringbuffer.c b/src/ringbuffer.c
index 4967306d8..bae718f20 100644
--- a/src/ringbuffer.c
+++ b/src/ringbuffer.c
@@ -66,12 +66,13 @@ bool libcouchbase_ringbuffer_ensure_capacity(ringbuffer_t *buffer, size_t size)
         return false;
     } else {
         // copy the data over :)
+        char *old;
         size_t nbytes = buffer->nbytes;
         size_t nr = libcouchbase_ringbuffer_read(buffer, new_root, nbytes);
         if (nr != nbytes) {
             abort();
         }
-        char *old = buffer->root;
+        old = buffer->root;
         buffer->size = new_size;
         buffer->root = new_root;
         buffer->nbytes = nbytes;