Fix the md5 URI and various improvements