some minor changes get fixed for PO/PI