Even more tweaking to how we handle back connections.