Addressed NAATODOs.