Fixed url issues