Fixed bugs in org activation.