More fixes because of wrapper issues.