Fixed validating issues