fixes to crashes with server id mismatch