Some API clarifications