Things that didn't go through

from the last commit.