Fixed some bugs with PC4 to PC5