Fixes for using namespaces for controllers