Fixed final URLs