Further sensitivity tweaks