Stuff left out of previous commit