[SQUASH ME] pr_check: fixes