Fix some more required fields