Fix wrappers.