More fixes for gtk3 port.