Fixes to x-domain