Some more fixes in Dragonblight.