diff --git a/scripts/base_network.py b/scripts/base_network.py
index a3541e8e..41e36a30 100644
--- a/scripts/base_network.py
+++ b/scripts/base_network.py
@@ -107,7 +107,8 @@ def _apply_parameter_corrections(n):
                     r = pd.Series(repls["index"])
                 else:
                     raise NotImplementedError()
-                df.loc[r.index, attr] = r.astype(df[attr].dtype)
+                inds = r.index.intersection(df.index)
+                df.loc[inds, attr] = r[inds].astype(df[attr].dtype)
 
 def _set_electrical_parameters_lines(lines):
     v_noms = snakemake.config['electricity']['voltages']
diff --git a/scripts/build_shapes.py b/scripts/build_shapes.py
index 2a665c17..f2807058 100644
--- a/scripts/build_shapes.py
+++ b/scripts/build_shapes.py
@@ -28,7 +28,9 @@ def _simplify_polys(polys, minarea=0.1, tolerance=0.01):
     return polys.simplify(tolerance=tolerance)
 
 def countries():
-    cntries = snakemake.config['countries'] + ['KV']
+    cntries = snakemake.config['countries']
+    if 'RS' in cntries: cntries.append('KV')
+
     df = gpd.read_file(snakemake.input.naturalearth)
 
     # Names are a hassle in naturalearth, try several fields
@@ -37,7 +39,7 @@ def countries():
 
     df = df.loc[df.name.isin(cntries) & (df['scalerank'] == 0)]
     s = df.set_index('name')['geometry'].map(_simplify_polys)
-    s['RS'] = s['RS'].union(s.pop('KV'))
+    if 'RS' in cntries: s['RS'] = s['RS'].union(s.pop('KV'))
 
     return s
 
@@ -109,6 +111,7 @@ def nuts3(country_shapes):
         columns=['NUTS_ID', 'country', 'pop']
     ).set_index('NUTS_ID')
     manual['geometry'] = manual['country'].map(country_shapes)
+    manual = manual.dropna()
 
     df = df.append(manual)