Fix party management