Launch bugs fixed