Fix up required fields