fixes in controllers