Unbreaking the database connection stuff