[Connection] Cosmetic fixes...