Took care of a couple TODOs.