Some fixes

Signed-off-by: Carlos <carlos@doofinder.com>