Fixes further validator inconsistencies