A bunch of updates that got missed in the source branch, oops.