fix issues for validator