Fixed some issues

Change-Id: Ia7428a5ec9aa733dd46ffb12441ee2b1193750d8
Signed-off-by: Marcelo <Marcelo@DES214>