Minor fixes that I forgot to add between playing with the API and updating my code.