Add back missing stuff