Performance improvements in neutron - fix some issues