Fixes from me, Venkat. Includes changes to employee.