More GTK 2.x compatible fixes towards GTK 3.x support.