fixes for pps order issues