Policy validation fixes.