Fixed some stenciling issues