App migrations and model fixes