Dwarf generation fixed pt 2

Thanks to slyfox for the reports!