more fixes for mjolnir