AxisMask & Custom Surface Normal Disp Fixes