Adapt some types