Chat join fixes