fixed a few serialization issues