Fixes for gwt in uSDLC2