Number of fixes around deserializing