Fix mistakes