diff --git a/Ganeti/HTools/Cluster.hs b/Ganeti/HTools/Cluster.hs
index 788288ead1c26df3ba849654c07ad9b43bc8ba3b..93a5ce506ebaf433ac62d4805f1eaac57c1d3e32 100644
--- a/Ganeti/HTools/Cluster.hs
+++ b/Ganeti/HTools/Cluster.hs
@@ -754,7 +754,7 @@ loadData ndata idata =
         (ktn, nl) = loadTabular ndata
                     (\ (i:jt:jf:kt:kf:[]) -> (i, Node.create jt jf kt kf))
                     Node.setIdx
-    {- instance file: name mem disk -}
+    {- instance file: name mem disk pnode snode -}
         (kti, il) = loadTabular idata
                     (\ (i:j:k:l:m:[]) -> (i,
                                            Instance.create j k
diff --git a/Ganeti/HTools/Node.hs b/Ganeti/HTools/Node.hs
index 03bff788237f7e55d7b9755a3341b40c9a819dfb..e667ce31a22f7eeaf8a9d763a3f61561e994b903 100644
--- a/Ganeti/HTools/Node.hs
+++ b/Ganeti/HTools/Node.hs
@@ -6,8 +6,8 @@
 
 module Ganeti.HTools.Node
     (
-      Node(failN1, idx, f_mem, f_dsk, p_mem, p_dsk, slist, plist,
-           p_rem, offline)
+      Node(failN1, idx, t_mem, f_mem, t_dsk, f_dsk, p_mem, p_dsk, p_rem,
+           plist, slist, offline)
     -- * Constructor
     , create
     -- ** Finalization after data loading
diff --git a/Makefile b/Makefile
index 67096d463f400f1eac8360098ec2322b4255fec5..ca410585c4c36bec7a1714480463bce9c1dabdda 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ DOCS = README.html NEWS.html
 
 all: $(HPROGS)
 
-hn1 hbal: % : %.hs Ganeti/HTools/Version.hs $(HSRCS) Makefile
+$(HPROGS): %: %.hs Ganeti/HTools/Version.hs $(HSRCS) Makefile
 	ghc --make -O2 -W $@
 
 $(DOCS) : %.html : %