Removed some fixmes