A few fixes to ensure that there can be no more potential timing / alising issues in our code.