Fixed FIXME's