Fixing bugs
Merge pull request #1896 from fstagni/v6r11fixes-2

[v6r11] Fixing bugs