Fix mistakes in refactoring