CRA validation fixes.