Correct some serialization errors