concurrency bug fixes

Change-Id: I93c0e90bc7de184319cdb5faa9a82329a8052a1b