(gui) Minor fixes
(c) Fix indentation of generated code
(hmpp) Fix generated code related to alignement changes