More IDE fixes for 7.0 DP 10