Hotfixes production take 2

Rebased sin los errores de fin-de-línea.
Surrounding space missing in default value assignment.