Fix in controllers and models