Fixed some TODO and FIXME markers