Resolved several issues with controllers