Reinstate all the fixes. Take 3.
Debugging infO
Fix?
Remove logging