Fixed most url issues