Output validation fixes