fixes for validators