fixes for glib-2.36.0