Small fixes + pooling