Fix some fields that can be null