More zombie mapping fixes.