Bug fixes and migration rename