fix some pr issues