Fixing todo comments.