More Touch tweaks