Tweaks to improve interactivity