(x) Fixed serialization issues