Some more fixes for stencil less rendering