RE: multi-homing fixes