multi domain fixes