[v6r11] Minor fixes