Fix TODOs

Signed-off-by: apporc <appleorchard2000@gmail.com>