More PR comment fixes