Fix signalling which fields are required