Fix DateTime related issues
Fix several clone-related issues