disconnect fixes