Fixed: Extra qualifications (Material::) and build errors