Fix modules, prepare for database updates