more __deref__ changes