Fix typos, fix race condition, fix...