* Make state saving more robust
