Fixes connection creation & deletion