Warnings clean up

COUCHDB-2455