fix bugs for new org