Fix for new PA features

Change-Id: Ib02e28d8d1c0eaf92612c046735dd02e2d3aea3d