Fix url issues