Hotfixes production take 2

Rebased sin los errores de fin-de-línea.
Line is too long. [90/80]