BLK-36 Bugs and crap

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