More pooler compatibility fixes