Few changes from Sergey R.

Few changes from Sergey R.