Minor API edits