[NT] Fix small bugs, remove unnecessary TODOs