fixing api issues