*9002* Tweaks from review