Fixed data validation functions;