Fix more leaks
Fix static analyzer issue