Fix blacklist, connection logic