Made some tweaks for the live API