Fixed dates
Minor fixes