Resolved issues with loading override controllers