API fixes

Change-Id: I620b96257a7307e9947871396aad7da596d66ab7