bugfixes

Signed-off-by: Eduardo Stuart <stuart.eduardo@gmail.com>