Updated touch support (fixes)