Better GTK 3.6 compatibility