Fix/multidomain fixes

Merged Samuel Burbulla requested to merge fix/multidomain-fixes into feature/multidomain-on-3.0

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.

Merge request reports