fixes proposed during PR review