Make Date conversion fixes