Launcher small improvements