More shader fixing