Some old stuff I forgot to commit.