More shader tweaks