Fix datetime check
Handle moved repo
0.20.2