fixes for date issues