Another minor fixes
Add the wrapper back