More corrections for glib port.