BIT-429 last fixes

Signed-off-by: Yasen Yankov <iasen.iankov@gmail.com>