Tweaks to handle input