cleanup build
Merge branch 'dp_fixes'