First round of PR review fixes