Many fixes in neutron plugin