Fix mandatory fields