lots of fixes to get icehouse booted with Neutron