More shader fixes.