Small validation fixes