Trying to fix build issues (also, removing gwt from build)