Fixes for crash on launcher exit