CTPA: Improve handling pps vs Mpps