Fix some api issues