Fix stuff that disappeared with previous commit