Hotfixes production take 2

Rebased sin los errores de fin-de-línea.
Prefer {...} over do...end for single-line blocks.