Minor Manage controller updates