Manager Fixes