Bug fixes for employees. Julian will fix the rest.