Fixes in wrapper and CE232