Bug fixes for my code

Signed-off-by: David Zafman <david.zafman@inktank.com>