neutron fixes