fixes during PR review