Null field fixes