Small changes in controllers