Some fixes
Extract partners