diff --git a/README.md b/README.md
index 04e85dec..98d027aa 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,12 @@
 # PyPSA-Eur: An Open Optimisation Model of the European Transmission System
 
+*NOTE (02. March 2019): There is a bug in the network clustering routines for
+PyPSA 0.13.2 that distorts the `capital_cost` for expanding conventional
+generators (OCGT and CCGT) in the aggregated networks. [See
+#52](https://github.com/PyPSA/PyPSA/pull/52) which is fixed by commit
+[6dd8cb](https://github.com/PyPSA/PyPSA/commit/6dd8cb2a8dfc1a409e0b8b6bfe7372b4f914d0fa).
+Use the new `environment.yaml` to update PyPSA to the current `master` branch!.*
+
 PyPSA-Eur is an open model dataset of the European power system at the
 transmission network level that covers the full ENTSO-E area.
 
diff --git a/config.yaml b/config.yaml
index e23d5665..6cc3a224 100644
--- a/config.yaml
+++ b/config.yaml
@@ -187,9 +187,8 @@ solving:
     formulation: kirchhoff
     #load_shedding: true
     noisy_costs: true
-    min_iterations: 4
-    # max_iterations: 6
-    max_iterations: 3
+    min_iterations: 3
+    max_iterations: 5
     #nhours: 10
     clip_p_max_pu: 0.01
   solver:
@@ -199,6 +198,9 @@ solving:
     crossover: 0
     BarConvTol: 1.e-5
     FeasibilityTol: 1.e-6
+    AggFill: 0
+    PreDual: 0
+    GURO_PAR_BARDENSETHRESH: 200
   # solver:
   #   name: cplex
   #   threads: 4
diff --git a/environment.yaml b/environment.yaml
index 4f362ba0..4a83e95b 100644
--- a/environment.yaml
+++ b/environment.yaml
@@ -21,7 +21,7 @@ dependencies:
 
   # Second order dependencies which should really be deps of atlite
   - xarray
-  - netcdf4!=1.4.2 # Don't use 1.4.2 https://github.com/Unidata/netcdf4-python/issues/870
+  - netcdf4
   - bottleneck
   - cyordereddict
   - toolz
@@ -44,11 +44,15 @@ dependencies:
 
   # The FRESNA/KIT stuff is not packaged for conda yet
   - pip:
-    - pypsa>=0.13.2
+    #- pypsa>=0.13.2
+    - git+https://github.com/PyPSA/pypsa.git#egg=pypsa # Until https://github.com/PyPSA/PyPSA/commit/6dd8cb2a8dfc1a409e0b8b6bfe7372b4f914d0fa is released
+
     - vresutils>=0.2.5
     - git+https://github.com/FRESNA/atlite.git#egg=atlite
     - git+https://github.com/PyPSA/glaes.git#egg=glaes
     - git+https://github.com/PyPSA/geokit.git#egg=geokit
     #- git+https://github.com/FRESNA/powerplantmatching.git#egg=powerplantmatching
-    #- https://software.ecmwf.int/wiki/download/attachments/56664858/ecmwf-api-client-python.tgz
 
+    - git+https://github.com/Unidata/netcdf4-python.git#egg=netcdf4
+    # Upgrade from 1.4.2 https://github.com/Unidata/netcdf4-python/issues/870 
+    # Until https://github.com/Unidata/netcdf4-python/commit/d1a806aa7a0c46c46bde89b83bb2ceaa05da5f0b is released