some fixes on Desktop launcher