[Export CRA] Fix various bugs