Fixes to touch