[DF-3978] More fixes for grass fog