Fix self-shadowing glitches