multi-homing fixes