Client connection fixes