misc needed fixes