Add in some missing stuff