Some fixes to wrapper API

Merge request reports

Loading