Merged migrations and fixed some user model issues