Join & Leave tweaks