FIXME and TODO review