Fixes on domain backend