Fix service (de-)serialization