Fixed flawed validations