Correct some mistakes after `refactoring`