Fixes for touch and mouse input