Fixed some issues to launch in Indigo