Bug fixes for cluster launcher