Adjust some methods in controllers and models