Fixes 2 threading issues in general character components