Fix for air-by-date issues
Couple small code fixes