Fixes to APi
Merge branch 'fix_api'