Final validation fixes