fixes for pr review