Removed some FIXME