Fixing more urls