general fixes for launch