Fixed root_url issues