Basic fixes to API