Added more waits for the database to get set up