Fix mistakes in PDCA handling