Tweaks as per PR comments