Pat's fixes for multiple LDAPs