diff --git a/glade/delugegtk.glade b/glade/delugegtk.glade
index ef56e2394..fa23e1135 100644
--- a/glade/delugegtk.glade
+++ b/glade/delugegtk.glade
@@ -126,6 +126,7 @@
                             <child>
                               <widget class="GtkLabel" id="summary_eta">
                                 <property name="visible">True</property>
+                                <property name="xalign">0</property>
                               </widget>
                               <packing>
                                 <property name="left_attach">3</property>
@@ -892,7 +893,7 @@
                             <child>
                               <widget class="GtkCheckMenuItem" id="chk_eta">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">ETA</property>
+                                <property name="label" translatable="yes">Time Remaining</property>
                                 <property name="use_underline">True</property>
                                 <property name="active">True</property>
                                 <signal name="toggled" handler="eta_toggle"/>
diff --git a/libtorrent/src/torrent_handle.cpp b/libtorrent/src/torrent_handle.cpp
index 44dcba7f5..de6f8d170 100755
--- a/libtorrent/src/torrent_handle.cpp
+++ b/libtorrent/src/torrent_handle.cpp
@@ -563,6 +563,7 @@ namespace libtorrent
 				for (int j = 0; j < num_bitmask_bytes; ++j)
 				{
 					unsigned char v = 0;
+					int bits = std::min(num_blocks_per_piece - j*8, 8);
 					for (int k = 0; k < 8; ++k)
 						v |= i->info[j*8+k].finished?(1 << k):0;
 					bitmask.insert(bitmask.end(), v);