Fix mistakes (bis)