Taking care of more TODOs.