Fixup URL construction and wrappers