More race condition guards