Bug fixes

Signed-off-by: David Diaz <d@viddiaz.com>