A few bugfixes, mostly around the launching