Fixes of wrapper.