more pcc fixes