- Few fixes

Signed-off-by: Renann Prado <darkness.renann@gmail.com>