Wrappers fix backporting