Solved some instantiation/assignment race conditions.