Bugfix - Uris are being deserialized like strings, and that's bad

Let me know if there's anything missing from the PR