some pr review fixes