CM fixes

Signed-off-by: Yury Kaliada <fut.wrk@gmail.com>