RPT violation fixes

@markewallace - Hi Mark. Here some fixes to RPT violations that I encountered when browsing the samples. More to follow.