Inugami BD11 changes

More BD fixes.