final fixes for launch