Improve launcher source behavior