Fix some todos