fixed small issues #Task 12966#