Bug fixes
Signed-off-by: Delian Delchev <delian.delchev@gmail.com>