Fixing url issues