More PBI version fixes for 10.x