Tweaks for responsiveness