Final adjustments for marshalling 2.0