Rpt fixes

@markewallace - Hi Mark. Here some more RPT validation fixes.