Fix id instance issue + export 'undefined' baseline bug