Missing stuff from previous commit