Beta-multitouch fixes