Small fixes for CMNN stencils.