Necessary fixes to get the updated model to validate properly.