Couple of additional changes to improve concurrency support