[v6r11] Fixing bugs