deserializer fixes