TwoTouch and Neutron bugfixes