Minor formatting fixes - Adrien / Jonathan
Merge with Flavien fixes - Adrien