diff --git a/backend/server/api/jobs.py b/backend/server/api/jobs.py
index 7fa1092..58e08ba 100755
--- a/backend/server/api/jobs.py
+++ b/backend/server/api/jobs.py
@@ -582,12 +582,24 @@ async def get_job_deliverables(job_id: str):
             reader = csv.DictReader(f)
             for row in reader:
                 # Map brief-extractor CSV columns → AC Deliverable schema
-                market = row.get('language_country_market', '')
+                market = row.get('language_country_market', '').strip()
                 lang, country = ('', '')
                 if '-' in market:
                     parts = market.split('-', 1)
                     lang = parts[0].strip().upper()
                     country = parts[1].strip().upper()
+                elif len(market) == 2:
+                    # Plain 2-letter code — could be language (EN, DE, FR) or country (UK, US)
+                    # Common language codes get mapped to Language; country-only codes to Country
+                    LANG_CODES = {'EN', 'DE', 'FR', 'NL', 'ES', 'IT', 'PT', 'PL', 'RU', 'JA', 'ZH', 'AR', 'KO'}
+                    m = market.upper()
+                    if m in LANG_CODES:
+                        lang = m
+                    else:
+                        country = m
+                elif market:
+                    # Longer value like "English" or "Dutch" — put in Language
+                    lang = market
 
                 deliverables.append({
                     'Number': '',
diff --git a/backend/server/config_runtime.py b/backend/server/config_runtime.py
index 61cf9ca..add4883 100755
--- a/backend/server/config_runtime.py
+++ b/backend/server/config_runtime.py
@@ -60,7 +60,7 @@ class ServerConfig:
 
     # AI
     GEMINI_API_KEY: str = os.getenv('GEMINI_API_KEY', '')
-    GEMINI_MODEL: str = os.getenv('GEMINI_MODEL', 'gemini-2.0-flash-exp')
+    GEMINI_MODEL: str = os.getenv('GEMINI_MODEL', 'gemini-3-flash-preview')
 
     # Data paths — mounted as Docker volume
     DATA_DIR: str = os.getenv(
diff --git a/docker-compose.yml b/docker-compose.yml
index 6aa3405..8a1e15e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -62,6 +62,7 @@ services:
 
       # Google Gemini
       GEMINI_API_KEY: ${GEMINI_API_KEY:-}
+      GEMINI_MODEL: ${GEMINI_MODEL:-gemini-3-flash-preview}
       GOOGLE_MODEL: ${GOOGLE_MODEL:-gemini-3.1-pro-preview}
       GOOGLE_TEMPERATURE: ${GOOGLE_TEMPERATURE:-0.7}
       GOOGLE_MAX_OUTPUT_TOKENS: ${GOOGLE_MAX_OUTPUT_TOKENS:-100000}
diff --git a/frontend/src/pages/SheetPage.tsx b/frontend/src/pages/SheetPage.tsx
index 6dde19c..cd393fa 100644
--- a/frontend/src/pages/SheetPage.tsx
+++ b/frontend/src/pages/SheetPage.tsx
@@ -210,7 +210,7 @@ export default function SheetPage() {
       </div>
 
       {/* Spreadsheet */}
-      <div className="flex-1 overflow-hidden rounded" style={{ border: '1px solid var(--border)' }}>
+      <div className="flex-1 overflow-hidden rounded min-h-0" style={{ border: '1px solid var(--border)' }}>
         {deliverables !== undefined && (
           <HotTable
             ref={hotRef}