PR review fixes