More responsiveness tweaks