One more bug fixes.
One more bug fixes.


Former-commit-id: 0ec2893375b51c41daa5f66ea9ccef261dd91a2f
Former-commit-id: 3b4d64e9c67d682748fdcdd1f2fa42c7489f502b
dilawar/ncbs-hippo,dilawar/ncbs-hippo,dilawar/ncbs-minion,dilawar/ncbs-hippo,dilawar/ncbs-minion,dilawar/ncbs-minion,dilawar/ncbs-hippo,dilawar/ncbs-minion,dilawar/ncbs-minion,dilawar/ncbs-hippo