fix org issues