Fixes for PR comments and some revwalk