More fixes for weather project