Backport fixes for regressions from ea1527a8 to 1.20 branch
Sorry, I should have included these in !377 (merged), but missed them. They fix the build on platforms using the stubs, and silence some compiler warnings.
Sorry, I should have included these in !377 (merged), but missed them. They fix the build on platforms using the stubs, and silence some compiler warnings.