more fixes to gwt