and a couple more small fixes for mjolnir