fix pr issues