Fix more potential memory errors...