Make some fields not null