database.xml fixes