fixed service leaks