Fix issues with unspecified fields