fixes on mandatory state of fields