Fix up of Touch samples - v3