Various fixes for Gtk 3.10
Merge remote-tracking branch 'cobinja/master'