Update to now work with latest gtk changes