Fixed first few issues with fault tolerance?