Some fixes for GTK engine