More tweaks to pooling