Fixes for DRRPP