dpm2: #1 & #3 fixed