More PGR and RTL edits

Fixed some more exceptions.