[SummerNSA] Some corrections.