[v6r12] Some fixes