Further tweaks to langmaterial migration