Sync GWT emulation with changes in core