fix up some places?