Fixes on Touch Devices