Few other TODOs