Fixes for GTK 3.8