Minor changes to ConvPoolLayer