material: fix various issues ...