Connection pool fixes