Fixing up the date conversion (still more to come...)