Fixes for controller-info.xml