Bug fixes in all controller

Fixes are in progress