More race conditions fixes