Small fixes to cap touch