Additional changes for gtkbuilder integration.