Fixed GWT compilation issues resulting from the merge