Update for DP6
Final fixes for DP6