Fixing up Comfort Stations