GWT fixes after review