Missing additions.

Stuff leftover from previous commit.