Misc. fixes/improvements to API/SDE usage