Minor fixes + deserializers