Fixing some wrappers