Deserialization fixes [skip ci]