Remove couple of FIXME-s