Some dwarf fixes