Compatibility fixes for latest pool version