Fix required fields