Fixed path and date-year problems