PathFinder: base_directory fix for ApiCLI