Ninja and DS Mass Driver fixes