Fix mistakes in previous commit