Ensuring we not leaking connections