[v6r12] More pilot commands fixes