More launch script fixes