[v6r11] Several fixes