Post SPR-8804 minor code tweaks