More HLSL fixes