Re: [Context] update before building & fixing some issues