Inugami BD06 changes

More BD fixes.