Fix org/program relationship