Some WinterMod improvements