some fixes for building DiDemoFramework