Fixes to Manager and Employee