Fixing some issues with Employment