Fixed up some todos