Add back some things I missed