Inugami BD04 changes

More BD fixes.