Add back some missing bits