fix up some more issues...