Material class tweaks