Fixed some problems with the launcher and the wizard