Fixed exit cleanup while streaming/recording