some minor fixes to Manager