Fixes for launch config