Fix to adapt glib helpers

Change-Id: I2547d91526dfdbe51228368b6e45115760efde9a