Hotfixes production take 2

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