fixes and migrations