more API consistency improvements