leak fix
makefile patch