Fixup shader and bit of cleanup