Analysis results and fixing some leaks