Fixing winter issues