minor fixes to API