more fixes for mjolnir :)