Fix/multidomain fixes

I had some issues while compiling the multidomain code. These commits include some fixups that worked for me. Maybe you should review and merge them.