Inugami BD07 changes

More BD fixes.