Merge "API tweaks"