Misc Management Fixes