Re: multi-homing fixes