BP-832 fix bugs
2 files changed