fix a few more broken things