Validation fixes again