Fix other api bugs