Fix mistakes from previous commit