Fixes to get add member working on SmartCloud