Fixes and dependencies changes

Signed-off-by: Renato Mendes <renato.mendes.1123@gmail.com>