fix leaks
fix more leaks