Fixes for regressions controllers.xml