Organisation issues fixed