Fixes minor DateTime issues