Inugami BD12 changes

More BD fixes.