Fixing up the connectivity