Improve handling of PQ updates