diff --git a/htools/Ganeti/HTools/Cluster.hs b/htools/Ganeti/HTools/Cluster.hs
index 57873fdc58ce5ccc0603a89157a1c83e80002633..4b2a588feac3f64c4a880a3e0e7834373282f0de 100644
--- a/htools/Ganeti/HTools/Cluster.hs
+++ b/htools/Ganeti/HTools/Cluster.hs
@@ -105,7 +105,7 @@ data EvacSolution = EvacSolution
     { esMoved   :: [(Idx, Gdx, [Ndx])]  -- ^ Instances moved successfully
     , esFailed  :: [(Idx, String)]      -- ^ Instances which were not
                                         -- relocated
-    , esOpCodes :: [[[OpCodes.OpCode]]] -- ^ List of lists of jobs
+    , esOpCodes :: [[OpCodes.OpCode]]   -- ^ List of jobs
     }
 
 -- | Allocation results, as used in 'iterateAlloc' and 'tieredAlloc'.
@@ -1057,7 +1057,7 @@ updateEvacSolution (nl, il, es) idx (Bad msg) =
     (nl, il, es { esFailed = (idx, msg):esFailed es})
 updateEvacSolution (_, _, es) idx (Ok (nl, il, opcodes)) =
     (nl, il, es { esMoved = new_elem:esMoved es
-                , esOpCodes = [opcodes]:esOpCodes es })
+                , esOpCodes = opcodes:esOpCodes es })
      where inst = Container.find idx il
            new_elem = (idx,
                        instancePriGroup nl inst,
diff --git a/lib/rpc.py b/lib/rpc.py
index 8244215273c75e248db9f8b0edcf4c4f6005297b..b6657a2c19cef43dfb3cf4eda915ce7ff0c6b6a1 100644
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -446,7 +446,7 @@ class _RpcProcessor:
     assert procedure in _TIMEOUTS, "RPC call not declared in the timeouts table"
 
     if not http_pool:
-      http_pool = _thread_local.GetHttpClientPool()
+      http_pool = http.client.HttpClientPool(_ConfigRpcCurl)
 
     if read_timeout is None:
       read_timeout = _TIMEOUTS[procedure]
diff --git a/tools/kvm-ifup.in b/tools/kvm-ifup.in
index 4ba17e7f5bd20af1bebf3dff4cac4aa5175af9c1..2ff8ccb5254bab6ffb84c39185a36feba50330b3 100644
--- a/tools/kvm-ifup.in
+++ b/tools/kvm-ifup.in
@@ -36,6 +36,8 @@ fi
 ip link set $INTERFACE up
 
 if [ "$MODE" = "bridged" ]; then
+	ip link set $INTERFACE mtu $(</sys/class/net/${BRIDGE}/mtu)
+
 	# Connect the interface to the bridge
 	brctl addif $BRIDGE $INTERFACE
 else