A few more field fixes [MJ-601]