diff --git a/llama_stack/apis/memory/client.py b/llama_stack/apis/memory/client.py
index d2845326b..7b61cd830 100644
--- a/llama_stack/apis/memory/client.py
+++ b/llama_stack/apis/memory/client.py
@@ -13,12 +13,12 @@ from typing import Any, Dict, List, Optional
 
 import fire
 import httpx
-
-from llama_stack.distribution.datatypes import RemoteProviderConfig
 from termcolor import cprint
 
-from .memory import *  # noqa: F403
-from .common.file_utils import data_url_from_file
+from llama_stack.distribution.datatypes import RemoteProviderConfig
+
+from llama_stack.apis.memory import *  # noqa: F403
+from llama_stack.providers.utils.memory.file_utils import data_url_from_file
 
 
 async def get_client_impl(config: RemoteProviderConfig, _deps: Any) -> Memory:
diff --git a/llama_stack/cli/stack/build.py b/llama_stack/cli/stack/build.py
index f35c6ceab..0393fb708 100644
--- a/llama_stack/cli/stack/build.py
+++ b/llama_stack/cli/stack/build.py
@@ -212,7 +212,7 @@ class StackBuild(Subcommand):
                 providers_for_api = all_providers[api]
 
                 api_provider = prompt(
-                    "> Enter the API provider for the {} API: (default=meta-reference): ".format(
+                    "> Enter provider for the {} API: (default=meta-reference): ".format(
                         api.value
                     ),
                     validator=Validator.from_callable(