several fixes in controllers