Fixing URLs for 1.6