Small changes to accommodate the new material manager.