Fixed a few issues with the URL serialization.