Fixes specific for XDN