Field mapping fixes