pr review fixes