fixes in wrapper