Bugfixes for dds exports