Some very old updates I never quite pushed out, but committing before
checking viability of merging.