gio fixups
5 files changed