Fixed a few small TODO's