Fixed Touch events implementation (mainly build fix)