[All] Fix compilation on the Microsoft compiler
[All] Cleanup