Changes for latest rust.
Fix crash in magic.