Fixes for Employee