Not sure what changed in the library/API, but this code fixed the few
that aren't working. Will investigate later.