minor fixes in controller