Added some FIXME comments