Fixed renaming issue
Improved ReportLog warning information in case of error recovery token
insertion