Fix material 2

Addresses issues demonstrated by first use in production.