Continue debugging. A few race conditions remaining