A few more tweaks to when party mode is enabled