Hotfixes production take 2

Rebased sin los errores de fin-de-línea.
Use empty lines between defs.