Fix mistakes during the change