Fixed validation mistakes