Small fixes, including better external launcher