Fixing up url structures