Fix url resolving