fix api issues