Minor fixes. RNG still breaks near endgame