(Potentially) repaired event threading issues