A couple more tweaks from Shanes meta-PR