Minor bugs fix

Also-by: gcalvino <guillermo.calvinosanchez@altran.com>
Signed-off-by: Benjamin Diaz <bdiaz@whitestack.com>
11 files changed