Fixed materials after last commit's reorg