Fix urls resolving