Parties fixes

Parties fixes