Fix string and primitive fields from being null