Fix BaseUrl issues