Stuff I forgot to stage in the d1834e39