Addressing a couple of TODOs.