Fixes MDs spawning with an old type that shouldn't exist and a couple is...

...sues with the wrong type spawning in lockers.