Fix additional base_url issues