A few more shader/material system bug fixes.