Improved backwards compatibility with GLib