Fixes for Material.