Bump database, small cleanups