Required fields fixed