Compatibility/test/coverage fixes for recent API additions