Fixes for launch