misc. small fixes in dmg2john