fixes for issues raised during PR review