Fix PA/Extensions