Changes to allow running sprout and bono on the same node