Backport fixes to the check and info tasks