Fix easy TODOs of correctness