more mjolnir fixes