Some minor changes to marshal/demarshal