[v6r12] Pilot fixes