Fixing first bugs

Signed-off-by: leandro.silverio <leandro.silverio@lge.com>