Correctly convert Files to URIs #1645