build-mode xdfmanager fixes