fix up some returns