Player joining fixes