fixes during pr review