Minor launcher CLI improvements