PartyViewModel fixes