fix up stuff from earlier