Bug fixes with material processing