Fix mistakes to have first launch complete