Compatibility/coverage fixes for recent API additions