Updates for PA builds