BLK-36 little bugs and junk

Signed-off-by: Oren Leiman <oleiman@neutral.io>