Fix stretch and date construction.