Fixed some todos