Database migration fix
Few changes