Minor changes to marshal.