few more cpx changes