Fixes during PR review