Bug fixes to migrations and fixtures from previous commit