Some race fixes
It would seem like there is a lot more but these will help reducing the log and amount of annotation I'm using to mark ones that I've found.
It would seem like there is a lot more but these will help reducing the log and amount of annotation I'm using to mark ones that I've found.