fixed api issues