Some code fixes after merge with master

Signed-off-by: ymesh <Yuri.Meshalkin@gmail.com>