Fix url issues

Not sure it's over yet