Fix URL and patch to 1.6.4