Finish fixing connect/accept