bug fixes

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>