Fix more bugs in PT merge