Fixed all DateTime conversions to be correct