Minor tweaks to required fields