Consistency edit
Material match additional fixes