API and services fixes