3.10: Fix innocuous make check failures