More stencil fixes.