Fix some fields being accidentally required