server crash fixes