Various fixes, as well as removed the database config file