Fix employer and spouse bugs.