Hotfixes production take 2

Rebased sin los errores de fin-de-línea.
Avoid using {...} for multi-line blocks.