Clean some fixmes