two fixes for errors found during pre-PR review