Fix up our exports
Tidied up toDate types