Fixes to member dropping.