Content fixes according to discussions in COUCHDB-1863