Fix non-existant fields