[DF-3540] Fixes in materials