Fixed more connection leaks