Additional couchbase tweaks