Sonar fixes to pooling