Fixes for validator