Changes to make ldapclient work.  A few small tweaks left.