Fixes to party mode