Upgrade marshalling to 1.4.8