Fix mistakes from previous commits