Rpt fixes 2

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