Added some server-side code for some concurrency fixes

Also tested the new client-side concurrency code.