several fixes with gwt