Various tweaks for responsiveness