Fixed GWT issues