Minor bugfixes, raked database.