Fixes minor issues with date conversions