Minor P/R improvements by submitter