[Export CRA] various fixes and updates