Resolve a bunch of repoman QA complaints