[v6r12] Several fixes