Few changes related to TODOs