Improving connection disposal (make sure all callbacks are done)