Misc tweaks trying to hack around windows shader bugs