Prevent double unsubscriptions
Fix for the fix
Core library patches - very annoying as I think I've done these before - doh!
Fix up of Touch samples