Fix two neutron service defects