Just few fixes
Fixed bug
Just set __RCSID__
Merge pull request #1908 from fstagni/v6r11fixes-3

[v6r11] Just few fixes