Minor fixes for launcher