Fixes by supergivi (Cepega)
Revert "Fixes by supergivi (Cepega)"

This reverts commit f3526c045bcd1a1e8ce766536c59c4681c971d67.
Revert "Revert "Fixes by supergivi (Cepega)""

This reverts commit ff5476ef5961a22f6f63fba86e7615f59aed5eaf.