a couple of small changes to get (de)serialization fully working