Fix up Material persistence.