Various fix with gtk2