More neutron fixes