more misc. fixes for gcdi launch