Make wire platform independent
orig_url -> originalUrl
Small cleanups