Further tweaks to responsiveness