Forgot to fix issue in some validator constructors