Fix another leak
Fix more leaks
Fix static analyzer issue