diff --git a/actions.cc b/actions.cc
index 45c03761..749421ac 100644
--- a/actions.cc
+++ b/actions.cc
@@ -54,7 +54,10 @@ void TreeViewMulti::on_drag_begin(const Glib::RefPtr<Gdk::DragContext> &context)
 bool negate(bool b) { return !b; }
 
 TreeViewMulti::TreeViewMulti() : Gtk::TreeView(), pending(false) {
-	get_selection()->set_select_function(sigc::group(&negate, sigc::ref(pending)));
+	get_selection()->set_select_function(
+	[this](Glib::RefPtr<Gtk::TreeModel> const&, Gtk::TreeModel::Path const&, bool) {
+           return !pending;
+       });
 }
 
 enum Type { COMMAND, KEY, TEXT, SCROLL, IGNORE, BUTTON, MISC };
diff --git a/handler.cc b/handler.cc
index 8830ea28..3bde46c8 100644
--- a/handler.cc
+++ b/handler.cc
@@ -533,7 +533,7 @@ class WaitForPongHandler : public Handler, protected Timeout {
 	virtual Grabber::State grab_mode() { return parent->grab_mode(); }
 };
 
-static inline float abs(float x) { return x > 0 ? x : -x; }
+/* static inline float abs(float x) { return x > 0 ? x : -x; } */
 
 class AbstractScrollHandler : public Handler {
 	bool have_x, have_y;
diff --git a/win.cc b/win.cc
index da41b0e8..36746430 100644
--- a/win.cc
+++ b/win.cc
@@ -275,7 +275,7 @@ void Win::timeout() {
 }
 
 void Win::set_icon(RStroke stroke, bool invert) {
-	if (!icon)
+	if (!icon || icon->get_size() <= 0)
 		return;
 	icon->set(stroke->draw(icon->get_size(), 2.0, invert));
 	set_timeout(10000);