fixes from gogui trial