More wrapper-specific changes