[#75113956] Some minor fixes
[#75113956] Big fix

Signed-off-by: sebareca <sebareca@gmail.com>