fixes for launch