Fixing build & adding bare minimum for deserialization