Some changes to touch handling