Fix some more areas where we're working with the default material directly rather than cloning it