Small fixes.
Use a lock, Luke.