Cleanup Warnings

COUCHDB-2455