server side fixes for late joining