Fixes for Material version.