diff --git a/llama_stack/cli/stack/configure.py b/llama_stack/cli/stack/configure.py
index 5bae7e793..ff2976c96 100644
--- a/llama_stack/cli/stack/configure.py
+++ b/llama_stack/cli/stack/configure.py
@@ -45,10 +45,10 @@ class StackConfigure(Subcommand):
         import pkg_resources
 
         import yaml
-        from termcolor import cprint
 
         from llama_stack.distribution.build import ImageType
         from llama_stack.distribution.utils.exec import run_with_pty
+        from termcolor import cprint
 
         docker_image = None
 
@@ -121,10 +121,10 @@ class StackConfigure(Subcommand):
         from pathlib import Path
 
         import yaml
-        from termcolor import cprint
 
         from llama_stack.distribution.configure import configure_api_providers
         from llama_stack.distribution.utils.serialize import EnumEncoder
+        from termcolor import cprint
 
         builds_dir = BUILDS_BASE_DIR / build_config.image_type
         if output_dir:
diff --git a/llama_stack/distribution/datatypes.py b/llama_stack/distribution/datatypes.py
index 29923e0bd..5cc4e56ff 100644
--- a/llama_stack/distribution/datatypes.py
+++ b/llama_stack/distribution/datatypes.py
@@ -283,6 +283,7 @@ As examples:
 The key may support wild-cards alsothe routing_key to route to the correct provider.""",
     )
     provider_routing_table: Dict[str, List[ProviderRoutingEntry]] = Field(
+        default_factory=dict,
         description="""
         API: List[ProviderRoutingEntry] map. Each ProviderRoutingEntry is a (routing_key, provider_config) tuple.
 
@@ -295,7 +296,7 @@ The key may support wild-cards alsothe routing_key to route to the correct provi
               torch_seed: null
               max_seq_len: 4096
               max_batch_size: 1
-        """
+        """,
     )
 
 
diff --git a/llama_stack/providers/impls/builtin/models/__init__.py b/llama_stack/providers/impls/builtin/models/__init__.py
index 788ecfbab..cd969917e 100644
--- a/llama_stack/providers/impls/builtin/models/__init__.py
+++ b/llama_stack/providers/impls/builtin/models/__init__.py
@@ -8,6 +8,8 @@ from typing import Any, Dict
 
 from llama_stack.distribution.datatypes import Api, ProviderSpec, StackRunConfig
 
+from .config import BuiltinImplConfig  # noqa
+
 
 async def get_builtin_impl(config: StackRunConfig):
     from .models import BuiltinModelsImpl