[DF-1434] Launcher Small Fixes