More work, fixing client crashes