Some API and fees changes