cleanups: Fix potential bugs in connect.c