Defer unlock semaphore to avoid deadlock.  Plus, config updates.