Fixing refreshments issues