Fixes previous commit and adds a few minor changes to the clientconnect early code.