Fixes on controllers