Hotfixes production take 2

Rebased sin los errores de fin-de-línea.
Expression at 6, 72 should be on its own line.