Fixed url issues (last)