A couple multitouch fixes