Fixed More Validation Issues